8a393fb06770e717d15afebf283334af246402e2,src/org/pentaho/di/job/entries/zipfile/JobEntryZipFile.java,JobEntryZipFile,processRowFile,#Job#Result#String#String#String#String#String#boolean#,264

Before Change


              for (int i = 0; i < zippedFiles.length; i++) {
                if (zippedFiles[i] != null) {
                  // Delete File
                  FileObject fileObjectd = KettleVFS.getFileObject(localSourceFilename + Const.FILE_SEPARATOR + zippedFiles[i], this);
                  if (!isSourceDirectory) {
                    fileObjectd = KettleVFS.getFileObject(localSourceFilename, this);
                  }

                  // Here we can move, delete files
                  if (afterzip == 1) {
                    // Delete File
                    boolean deleted = fileObjectd.delete();
                    if (!deleted) {
                      resultat = false;
                      logError(BaseMessages.getString(PKG, "JobZipFiles.Cant_Delete_File1.Label") + localSourceFilename + Const.FILE_SEPARATOR + zippedFiles[i]
                          + BaseMessages.getString(PKG, "JobZipFiles.Cant_Delete_File2.Label"));

                    }
                    // File deleted
                    if (log.isDebug())
                      logDebug(BaseMessages.getString(PKG, "JobZipFiles.File_Deleted1.Label") + localSourceFilename + Const.FILE_SEPARATOR + zippedFiles[i]
                          + BaseMessages.getString(PKG, "JobZipFiles.File_Deleted2.Label"));
                  } else if (afterzip == 2) {
                    // Move File
                    try {
                      FileObject fileObjectm = KettleVFS.getFileObject(realMovetodirectory + Const.FILE_SEPARATOR + zippedFiles[i], this);
                      fileObjectd.moveTo(fileObjectm);
                    } catch (IOException e) {
                      logError(BaseMessages.getString(PKG, "JobZipFiles.Cant_Move_File1.Label") + zippedFiles[i]

After Change


                    // Move File
                		FileObject fileObjectm=null;
                    try {
                          fileObjectm = KettleVFS.getFileObject(realMovetodirectory + Const.FILE_SEPARATOR + fileObjectd.getName().getBaseName());
	                      fileObjectd.moveTo(fileObjectm);
                    } catch (IOException e) {
                      logError(BaseMessages.getString(PKG, "JobZipFiles.Cant_Move_File1.Label") + zippedFiles[i]